auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 20:36:52 +0000 (21:36 +0100)
committerJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 20:36:52 +0000 (21:36 +0100)

Trivial merge